merge
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 29 Oct 2005 08:51:35 +0000 (09:51 +0100)
commit1464591d5ff73c5c8a983851be6263724a63314b
tree6ccff4fc606196f778f017629e2de80561e1119c
parent6a106a03b089d9f6153d29188497adc150cb2eeb
parentadeed21529928c872b8379714a976c2380d176eb
merge
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
tools/examples/Makefile
tools/python/xen/xend/image.py
xen/arch/ia64/xen/domain.c